Rebase patches

diff --git a/debian/patches/0006-Use-system-zlib.patch b/debian/patches/0006-Use-system-zlib.patch
deleted file mode 100644 (file)
index 3f52da7..0000000
--- a/debian/patches/0006-Use-system-zlib.patch
+++ /dev/null
@@ -1,921 +0,0 @@
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Thu, 30 May 2019 12:09:43 +0200
-Subject: Use system zlib
-
----
- Makefile.in | 404 ++++++++++++++++++++++++++++--------------------------------
- 1 file changed, 185 insertions(+), 219 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 5ace8da..be6f7d0 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -55,7 +55,7 @@ LRELEASE=@LRELEASE@
- #
- #OPTIMIZATION=-O $(EXTRA_OPTIMIZATION)
- #DEBUGGING=-g $(EXTRA_DEBUGGING)
--GBCFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) $(BUILD_CPP) @ZLIB_CPP@ @QT_INC_OPT@$(QT_INC) \
-+GBCFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) $(BUILD_CPP) @QT_INC_OPT@$(QT_INC) \
-       $(OPTIMIZATION) -DHAVE_CONFIG_H
- LDFLAGS=$(EXTRA_LDFLAGS) @LDFLAGS@
- PREFIX=@prefix@
-@@ -106,12 +106,6 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
- 
- SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o
- 
--ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
--      zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
--      zlib/uncompr.o zlib/gzlib.o zlib/gzclose.o zlib/gzread.o \
--      zlib/gzwrite.o zlib/zutil.o
--
--
- LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
-           csv_util.o strptime.o grtcirc.o util_crc.o xmlgeneric.o \
-           formspec.o xmltag.o cet.o cet_util.o fatal.o rgbcolors.o \
-@@ -120,7 +114,7 @@ LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
-     src/core/textstream.o \
-         src/core/usasciicodec.o \
-         src/core/xmlstreamwriter.o \
--        $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS)
-+        $(GARMIN) $(JEEPS) $(SHAPE) $(FMTS) $(FILTERS)
- OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
- 
- DEPFILES = $(OBJS:.o=.d)
-@@ -424,86 +418,86 @@ mac/libusb/libusb-1.0.a:
-       cd mac/libusb; $(QMAKE) @abs_srcdir@/mac/libusb/libusb.pro && $(MAKE)
- 
- # Machine generated from here down.
--alan.o: alan.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+alan.o: alan.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
--an1.o: an1.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+an1.o: an1.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   an1sym.h
--arcdist.o: arcdist.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+arcdist.o: arcdist.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   arcdist.h filter.h grtcirc.h src/core/logging.h
--bcr.o: bcr.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+bcr.o: bcr.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   csv_util.h garmin_tables.h
--bend.o: bend.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+bend.o: bend.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   bend.h filter.h grtcirc.h
--brauniger_iq.o: brauniger_iq.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+brauniger_iq.o: brauniger_iq.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h gbser.h
--bushnell.o: bushnell.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+bushnell.o: bushnell.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h
--bushnell_trl.o: bushnell_trl.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+bushnell_trl.o: bushnell_trl.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h
--cet.o: cet.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+cet.o: cet.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   cet.h
--cet_util.o: cet_util.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+cet_util.o: cet_util.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h cet_util.h src/core/logging.h
--compegps.o: compegps.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+compegps.o: compegps.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h cet_util.h csv_util.h jeeps/gpsmath.h \
-   jeeps/gpsport.h
--cst.o: cst.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+cst.o: cst.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   cet_util.h
--csv_util.o: csv_util.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+csv_util.o: csv_util.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h csv_util.h src/core/logging.h
--delgpl.o: delgpl.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+delgpl.o: delgpl.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
--destinator.o: destinator.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+destinator.o: destinator.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
-   jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
-   jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
-   jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \
-   strptime.h
--dg-100.o: dg-100.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+dg-100.o: dg-100.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   dg-100.h format.h gbser.h
--discard.o: discard.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+discard.o: discard.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   discard.h filter.h
--dmtlog.o: dmtlog.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+dmtlog.o: dmtlog.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   jeeps/gpsmath.h jeeps/gpsport.h xmlgeneric.h
--duplicate.o: duplicate.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+duplicate.o: duplicate.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h duplicate.h filter.h
--easygps.o: easygps.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+easygps.o: easygps.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
--energympro.o: energympro.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+energympro.o: energympro.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h energympro.h format.h
--enigma.o: enigma.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+enigma.o: enigma.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
--exif.o: exif.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+exif.o: exif.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   garmin_tables.h jeeps/gpsmath.h jeeps/gpsport.h
--explorist_ini.o: explorist_ini.cc defs.h config.h zlib/zlib.h \
--  zlib/zconf.h formspec.h inifile.h gbfile.h session.h \
-+explorist_ini.o: explorist_ini.cc defs.h config.h \
-+  formspec.h inifile.h gbfile.h session.h \
-   src/core/datetime.h src/core/optional.h explorist_ini.h
--f90g_track.o: f90g_track.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+f90g_track.o: f90g_track.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h
--fatal.o: fatal.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+fatal.o: fatal.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   src/core/logging.h
--filter_vecs.o: filter_vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+filter_vecs.o: filter_vecs.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h filter_vecs.h arcdist.h filter.h bend.h discard.h \
-   duplicate.h height.h heightgrid.h interpolate.h nukedata.h polygon.h \
-@@ -518,17 +512,17 @@ filter_vecs.o: filter_vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h yahoo.h
--formspec.o: formspec.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+formspec.o: formspec.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h
--g7towin.o: g7towin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+g7towin.o: g7towin.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   cet_util.h csv_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
-   jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
-   jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
-   jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \
-   garmin_tables.h strptime.h
--garmin.o: garmin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+garmin.o: garmin.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   cet_util.h format.h garmin_device_xml.h garmin_fs.h jeeps/gps.h \
-   jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \
-@@ -540,101 +534,101 @@ garmin.o: garmin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-   kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \
-   qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \
-   unicsv.h src/core/textstream.h xcsv.h yahoo.h
--garmin_device_xml.o: garmin_device_xml.cc defs.h config.h zlib/zlib.h \
--  zlib/zconf.h formspec.h inifile.h gbfile.h session.h \
-+garmin_device_xml.o: garmin_device_xml.cc defs.h config.h \
-+  formspec.h inifile.h gbfile.h session.h \
-   src/core/datetime.h src/core/optional.h garmin_device_xml.h \
-   xmlgeneric.h
--garmin_fit.o: garmin_fit.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+garmin_fit.o: garmin_fit.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h garmin_fit.h format.h jeeps/gpsmath.h \
-   jeeps/gpsport.h src/core/logging.h
--garmin_fs.o: garmin_fs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+garmin_fs.o: garmin_fs.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
-   jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
-   jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
-   jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \
-   garmin_tables.h
--garmin_gpi.o: garmin_gpi.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+garmin_gpi.o: garmin_gpi.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h garmin_gpi.h cet_util.h garmin_fs.h jeeps/gps.h \
-   jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \
-   jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
-   jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
-   jeeps/gpsrqst.h
--garmin_tables.o: garmin_tables.cc defs.h config.h zlib/zlib.h \
--  zlib/zconf.h formspec.h inifile.h gbfile.h session.h \
-+garmin_tables.o: garmin_tables.cc defs.h config.h \
-+  formspec.h inifile.h gbfile.h session.h \
-   src/core/datetime.h src/core/optional.h garmin_tables.h \
-   jeeps/gpsmath.h jeeps/gpsport.h src/core/logging.h \
-   garmin_icon_tables.h
--garmin_txt.o: garmin_txt.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+garmin_txt.o: garmin_txt.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h csv_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
-   jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
-   jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
-   jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \
-   garmin_tables.h src/core/textstream.h src/core/file.h strptime.h
--garmin_xt.o: garmin_xt.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+garmin_xt.o: garmin_xt.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h
--gbfile.o: gbfile.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+gbfile.o: gbfile.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   src/core/logging.h cet.h
--gbser.o: gbser.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+gbser.o: gbser.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   gbser.h gbser_private.h
--gbser_posix.o: gbser_posix.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+gbser_posix.o: gbser_posix.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h gbser.h gbser_private.h
--gdb.o: gdb.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+gdb.o: gdb.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   cet_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h garmin_tables.h \
-   grtcirc.h
--geo.o: geo.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+geo.o: geo.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   src/core/file.h
--geojson.o: geojson.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+geojson.o: geojson.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   geojson.h format.h src/core/file.h src/core/logging.h
--ggv_bin.o: ggv_bin.cc ggv_bin.h defs.h config.h zlib/zlib.h zlib/zconf.h \
-+ggv_bin.o: ggv_bin.cc ggv_bin.h defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h format.h
--ggv_log.o: ggv_log.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+ggv_log.o: ggv_log.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   grtcirc.h
--ggv_ovl.o: ggv_ovl.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+ggv_ovl.o: ggv_ovl.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   grtcirc.h
--globals.o: globals.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+globals.o: globals.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   gbversion.h
--globalsat_sport.o: globalsat_sport.cc defs.h config.h zlib/zlib.h \
--  zlib/zconf.h formspec.h inifile.h gbfile.h session.h \
-+globalsat_sport.o: globalsat_sport.cc defs.h config.h \
-+  formspec.h inifile.h gbfile.h session.h \
-   src/core/datetime.h src/core/optional.h globalsat_sport.h format.h \
-   gbser.h
--glogbook.o: glogbook.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+glogbook.o: glogbook.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h src/core/file.h xmlgeneric.h
--gnav_trl.o: gnav_trl.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+gnav_trl.o: gnav_trl.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h
--googledir.o: googledir.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+googledir.o: googledir.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h xmlgeneric.h
--gopal.o: gopal.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+gopal.o: gopal.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   cet_util.h csv_util.h grtcirc.h jeeps/gpsmath.h jeeps/gpsport.h \
-   strptime.h
--gpssim.o: gpssim.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+gpssim.o: gpssim.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   nmea.h format.h
--gpsutil.o: gpsutil.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+gpsutil.o: gpsutil.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   cet_util.h magellan.h
--gpx.o: gpx.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+gpx.o: gpx.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   gpx.h format.h src/core/file.h src/core/xmlstreamwriter.h \
-   src/core/xmltag.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
-@@ -642,88 +636,88 @@ gpx.o: gpx.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-   jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
-   jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h \
-   garmin_tables.h src/core/logging.h
--grtcirc.o: grtcirc.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+grtcirc.o: grtcirc.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   grtcirc.h
--gtm.o: gtm.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+gtm.o: gtm.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   jeeps/gpsmath.h jeeps/gpsport.h
--gtrnctr.o: gtrnctr.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+gtrnctr.o: gtrnctr.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   xmlgeneric.h
--height.o: height.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+height.o: height.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   height.h filter.h heightgrid.h
--hiketech.o: hiketech.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+hiketech.o: hiketech.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h src/core/xmlstreamwriter.h xmlgeneric.h
--holux.o: holux.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+holux.o: holux.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   holux.h
--html.o: html.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+html.o: html.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   jeeps/gpsmath.h jeeps/gpsport.h src/core/xmltag.h
--humminbird.o: humminbird.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+humminbird.o: humminbird.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h
--igc.o: igc.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+igc.o: igc.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   cet_util.h
--ignrando.o: ignrando.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+ignrando.o: ignrando.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h xmlgeneric.h
--igo8.o: igo8.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+igo8.o: igo8.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
--ik3d.o: ik3d.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+ik3d.o: ik3d.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   xmlgeneric.h
--inifile.o: inifile.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+inifile.o: inifile.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   src/core/file.h
--internal_styles.o: internal_styles.cc defs.h config.h zlib/zlib.h \
--  zlib/zconf.h formspec.h inifile.h gbfile.h session.h \
-+internal_styles.o: internal_styles.cc defs.h config.h \
-+  formspec.h inifile.h gbfile.h session.h \
-   src/core/datetime.h src/core/optional.h
--interpolate.o: interpolate.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+interpolate.o: interpolate.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h interpolate.h filter.h grtcirc.h \
-   src/core/logging.h
--itracku.o: itracku.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+itracku.o: itracku.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   gbser.h
- jeeps/gpsapp.o: jeeps/gpsapp.cc jeeps/gps.h jeeps/../defs.h config.h \
--  zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \
-+  formspec.h inifile.h gbfile.h defs.h \
-   session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \
-   jeeps/gpsserial.h jeeps/gpsusbint.h
- jeeps/gpscom.o: jeeps/gpscom.cc jeeps/gps.h jeeps/../defs.h config.h \
--  zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \
-+  formspec.h inifile.h gbfile.h defs.h \
-   session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h
- jeeps/gpsdevice.o: jeeps/gpsdevice.cc jeeps/gps.h jeeps/../defs.h \
--  config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \
-+  config.h formspec.h inifile.h gbfile.h defs.h \
-   session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsserial.h
- jeeps/gpsdevice_ser.o: jeeps/gpsdevice_ser.cc jeeps/gps.h jeeps/../defs.h \
--  config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \
-+  config.h formspec.h inifile.h gbfile.h defs.h \
-   session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsserial.h
- jeeps/gpsdevice_usb.o: jeeps/gpsdevice_usb.cc jeeps/gps.h jeeps/../defs.h \
--  config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \
-+  config.h formspec.h inifile.h gbfile.h defs.h \
-   session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \
-   jeeps/gpsusbcommon.h jeeps/gpsusbint.h
- jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/libusb.h \
--  jeeps/../defs.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h \
-+  jeeps/../defs.h formspec.h inifile.h gbfile.h \
-   defs.h session.h src/core/datetime.h src/core/optional.h \
-   jeeps/garminusb.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpsport.h \
-   jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
-@@ -731,95 +725,95 @@ jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/libusb.h \
-   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsusbcommon.h \
-   jeeps/../garmin_device_xml.h
- jeeps/gpsmath.o: jeeps/gpsmath.cc jeeps/gps.h jeeps/../defs.h config.h \
--  zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \
-+  formspec.h inifile.h gbfile.h defs.h \
-   session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsdatum.h
- jeeps/gpsmem.o: jeeps/gpsmem.cc jeeps/gps.h jeeps/../defs.h config.h \
--  zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \
-+  formspec.h inifile.h gbfile.h defs.h \
-   session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h
- jeeps/gpsprot.o: jeeps/gpsprot.cc jeeps/gps.h jeeps/../defs.h config.h \
--  zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \
-+  formspec.h inifile.h gbfile.h defs.h \
-   session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h
- jeeps/gpsread.o: jeeps/gpsread.cc jeeps/gps.h jeeps/../defs.h config.h \
--  zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \
-+  formspec.h inifile.h gbfile.h defs.h \
-   session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsserial.h
- jeeps/gpsrqst.o: jeeps/gpsrqst.cc jeeps/gps.h jeeps/../defs.h config.h \
--  zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \
-+  formspec.h inifile.h gbfile.h defs.h \
-   session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h
- jeeps/gpssend.o: jeeps/gpssend.cc jeeps/gps.h jeeps/../defs.h config.h \
--  zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \
-+  formspec.h inifile.h gbfile.h defs.h \
-   session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsserial.h
- jeeps/gpsserial.o: jeeps/gpsserial.cc jeeps/gps.h jeeps/../defs.h \
--  config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \
-+  config.h formspec.h inifile.h gbfile.h defs.h \
-   session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/../gbser.h \
-   jeeps/gpsserial.h gbser_posix.h
- jeeps/gpsusbcommon.o: jeeps/gpsusbcommon.cc jeeps/gps.h jeeps/../defs.h \
--  config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \
-+  config.h formspec.h inifile.h gbfile.h defs.h \
-   session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \
-   jeeps/gpsusbcommon.h
- jeeps/gpsusbread.o: jeeps/gpsusbread.cc jeeps/garminusb.h \
--  jeeps/gpsdevice.h jeeps/gps.h jeeps/../defs.h config.h zlib/zlib.h \
--  zlib/zconf.h formspec.h inifile.h gbfile.h defs.h session.h \
-+  jeeps/gpsdevice.h jeeps/gps.h jeeps/../defs.h config.h \
-+  formspec.h inifile.h gbfile.h defs.h session.h \
-   src/core/datetime.h src/core/optional.h jeeps/gpsport.h \
-   jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h \
-   jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h \
-   jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsusbint.h
- jeeps/gpsusbsend.o: jeeps/gpsusbsend.cc jeeps/gps.h jeeps/../defs.h \
--  config.h zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \
-+  config.h formspec.h inifile.h gbfile.h defs.h \
-   session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \
-   jeeps/gpsusbint.h
- jeeps/jgpsutil.o: jeeps/jgpsutil.cc jeeps/gps.h jeeps/../defs.h config.h \
--  zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h defs.h \
-+  formspec.h inifile.h gbfile.h defs.h \
-   session.h src/core/datetime.h src/core/optional.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h
--jogmap.o: jogmap.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+jogmap.o: jogmap.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   garmin_tables.h jeeps/gpsmath.h jeeps/gpsport.h xmlgeneric.h
--jtr.o: jtr.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+jtr.o: jtr.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   csv_util.h nmea.h format.h
--kml.o: kml.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+kml.o: kml.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   kml.h format.h src/core/file.h src/core/xmlstreamwriter.h xmlgeneric.h \
-   grtcirc.h src/core/logging.h src/core/xmltag.h units.h
--lmx.o: lmx.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+lmx.o: lmx.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   xmlgeneric.h
--lowranceusr.o: lowranceusr.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+lowranceusr.o: lowranceusr.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h lowranceusr.h format.h src/core/logging.h
--maggeo.o: maggeo.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+maggeo.o: maggeo.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   csv_util.h magellan.h
--magproto.o: magproto.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+magproto.o: magproto.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h explorist_ini.h format.h gbser.h magellan.h vecs.h \
-   dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \
-@@ -831,7 +825,7 @@ magproto.o: magproto.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-   jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
-   jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
-   jeeps/gpsrqst.h yahoo.h
--main.o: main.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+main.o: main.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   cet_util.h csv_util.h filter.h filter_vecs.h arcdist.h bend.h \
-   discard.h duplicate.h height.h heightgrid.h interpolate.h nukedata.h \
-@@ -846,191 +840,191 @@ main.o: main.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-   jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
-   jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
-   jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h yahoo.h
--mapasia.o: mapasia.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+mapasia.o: mapasia.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
--mapbar_track.o: mapbar_track.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+mapbar_track.o: mapbar_track.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h
--mapfactor.o: mapfactor.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+mapfactor.o: mapfactor.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h src/core/file.h src/core/xmlstreamwriter.h
--mapsend.o: mapsend.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+mapsend.o: mapsend.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   mapsend.h magellan.h
--mkshort.o: mkshort.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+mkshort.o: mkshort.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   cet.h
--mmo.o: mmo.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+mmo.o: mmo.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
--mtk_locus.o: mtk_locus.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+mtk_locus.o: mtk_locus.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h gbser.h
--mtk_logger.o: mtk_logger.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+mtk_logger.o: mtk_logger.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h gbser.h
- mynav.o: mynav.cc src/core/textstream.h src/core/file.h defs.h config.h \
--  zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h session.h \
-+  formspec.h inifile.h gbfile.h session.h \
-   src/core/datetime.h src/core/optional.h mynav.h format.h
--navicache.o: navicache.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+navicache.o: navicache.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h cet_util.h src/core/file.h
--naviguide.o: naviguide.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+naviguide.o: naviguide.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h csv_util.h jeeps/gpsmath.h jeeps/gpsport.h
--navilink.o: navilink.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+navilink.o: navilink.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h gbser.h jeeps/gpsmath.h jeeps/gpsport.h navilink.h
--navitel.o: navitel.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+navitel.o: navitel.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   jeeps/gpsmath.h jeeps/gpsport.h
--netstumbler.o: netstumbler.cc cet_util.h defs.h config.h zlib/zlib.h \
--  zlib/zconf.h formspec.h inifile.h gbfile.h session.h \
-+netstumbler.o: netstumbler.cc cet_util.h defs.h config.h \
-+  formspec.h inifile.h gbfile.h session.h \
-   src/core/datetime.h src/core/optional.h csv_util.h
--nmea.o: nmea.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+nmea.o: nmea.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   nmea.h format.h cet_util.h gbser.h jeeps/gpsmath.h jeeps/gpsport.h \
-   src/core/logging.h strptime.h
--nmn4.o: nmn4.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+nmn4.o: nmn4.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   cet_util.h csv_util.h
--nukedata.o: nukedata.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+nukedata.o: nukedata.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h nukedata.h filter.h
--osm.o: osm.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+osm.o: osm.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   osm.h format.h xmlgeneric.h
--ozi.o: ozi.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+ozi.o: ozi.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   csv_util.h jeeps/gpsmath.h jeeps/gpsport.h src/core/textstream.h \
-   src/core/file.h
--parse.o: parse.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+parse.o: parse.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   jeeps/gpsmath.h jeeps/gpsport.h
--pcx.o: pcx.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+pcx.o: pcx.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   cet_util.h csv_util.h garmin_tables.h
--pocketfms_bc.o: pocketfms_bc.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+pocketfms_bc.o: pocketfms_bc.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h
--pocketfms_fp.o: pocketfms_fp.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+pocketfms_fp.o: pocketfms_fp.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h xmlgeneric.h
--pocketfms_wp.o: pocketfms_wp.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+pocketfms_wp.o: pocketfms_wp.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h csv_util.h
--polygon.o: polygon.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+polygon.o: polygon.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   polygon.h filter.h
--position.o: position.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+position.o: position.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h grtcirc.h position.h filter.h
- qstarz_bl_1000.o: qstarz_bl_1000.cc qstarz_bl_1000.h defs.h config.h \
--  zlib/zlib.h zlib/zconf.h formspec.h inifile.h gbfile.h session.h \
-+  formspec.h inifile.h gbfile.h session.h \
-   src/core/datetime.h src/core/optional.h format.h src/core/logging.h
--radius.o: radius.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+radius.o: radius.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   radius.h filter.h grtcirc.h
--random.o: random.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+random.o: random.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   random.h format.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
-   jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
-   jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
-   jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h
--raymarine.o: raymarine.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+raymarine.o: raymarine.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h csv_util.h
--reverse_route.o: reverse_route.cc defs.h config.h zlib/zlib.h \
--  zlib/zconf.h formspec.h inifile.h gbfile.h session.h \
-+reverse_route.o: reverse_route.cc defs.h config.h \
-+  formspec.h inifile.h gbfile.h session.h \
-   src/core/datetime.h src/core/optional.h reverse_route.h filter.h
--rgbcolors.o: rgbcolors.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+rgbcolors.o: rgbcolors.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h
--route.o: route.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+route.o: route.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   grtcirc.h
--saroute.o: saroute.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+saroute.o: saroute.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   grtcirc.h
--sbn.o: sbn.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+sbn.o: sbn.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   navilink.h
--sbp.o: sbp.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+sbp.o: sbp.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   navilink.h
--session.o: session.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+session.o: session.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
--shape.o: shape.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+shape.o: shape.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   shape.h format.h shapelib/shapefil.h
- shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h
- shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h
- shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h
--skyforce.o: skyforce.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+skyforce.o: skyforce.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h
--skytraq.o: skytraq.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+skytraq.o: skytraq.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   gbser.h
--smplrout.o: smplrout.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+smplrout.o: smplrout.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h smplrout.h filter.h grtcirc.h
--sort.o: sort.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+sort.o: sort.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   sort.h filter.h
--src/core/textstream.o: src/core/textstream.cc defs.h config.h zlib/zlib.h \
--  zlib/zconf.h formspec.h inifile.h gbfile.h session.h \
-+src/core/textstream.o: src/core/textstream.cc defs.h config.h \
-+  formspec.h inifile.h gbfile.h session.h \
-   src/core/datetime.h src/core/optional.h src/core/textstream.h \
-   src/core/file.h
- src/core/usasciicodec.o: src/core/usasciicodec.cc src/core/usasciicodec.h
- src/core/xmlstreamwriter.o: src/core/xmlstreamwriter.cc \
-   src/core/xmlstreamwriter.h
--stackfilter.o: stackfilter.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+stackfilter.o: stackfilter.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h stackfilter.h filter.h
--stmsdf.o: stmsdf.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+stmsdf.o: stmsdf.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   cet_util.h csv_util.h grtcirc.h jeeps/gpsmath.h jeeps/gpsport.h \
-   src/core/logging.h
--stmwpp.o: stmwpp.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+stmwpp.o: stmwpp.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   cet_util.h csv_util.h
- strptime.o: strptime.c config.h strptime.h
--subrip.o: subrip.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+subrip.o: subrip.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   subrip.h format.h src/core/logging.h
--swapdata.o: swapdata.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+swapdata.o: swapdata.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h swapdata.h filter.h
--tef_xml.o: tef_xml.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+tef_xml.o: tef_xml.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   xmlgeneric.h
--teletype.o: teletype.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+teletype.o: teletype.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h
--text.o: text.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+text.o: text.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   jeeps/gpsmath.h jeeps/gpsport.h src/core/xmltag.h
--tiger.o: tiger.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+tiger.o: tiger.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   cet_util.h csv_util.h
--tmpro.o: tmpro.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+tmpro.o: tmpro.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   cet_util.h csv_util.h
--tomtom.o: tomtom.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+tomtom.o: tomtom.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
--tpg.o: tpg.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+tpg.o: tpg.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   jeeps/gpsmath.h jeeps/gpsport.h
--tpo.o: tpo.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+tpo.o: tpo.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   jeeps/gpsmath.h jeeps/gpsport.h
--trackfilter.o: trackfilter.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+trackfilter.o: trackfilter.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h trackfilter.h filter.h grtcirc.h
--transform.o: transform.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+transform.o: transform.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h transform.h filter.h
--unicsv.o: unicsv.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+unicsv.o: unicsv.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   unicsv.h format.h src/core/textstream.h src/core/file.h csv_util.h \
-   garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \
-@@ -1038,22 +1032,22 @@ unicsv.o: unicsv.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h garmin_tables.h \
-   src/core/logging.h
--units.o: units.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+units.o: units.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   units.h
--util.o: util.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+util.o: util.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   cet.h src/core/logging.h src/core/xmltag.h
- util_crc.o: util_crc.cc
--v900.o: v900.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+v900.o: v900.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
--validate.o: validate.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+validate.o: validate.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h validate.h filter.h
--vcf.o: vcf.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+vcf.o: vcf.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   jeeps/gpsmath.h jeeps/gpsport.h
--vecs.o: vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+vecs.o: vecs.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   vecs.h dg-100.h format.h energympro.h garmin_fit.h geojson.h \
-   src/core/file.h ggv_bin.h globalsat_sport.h gpx.h \
-@@ -1065,32 +1059,32 @@ vecs.o: vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-   jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
-   jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h yahoo.h \
-   gbversion.h src/core/logging.h
--vidaone.o: vidaone.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+vidaone.o: vidaone.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
--vitosmt.o: vitosmt.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+vitosmt.o: vitosmt.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   grtcirc.h
--vitovtt.o: vitovtt.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+vitovtt.o: vitovtt.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
--vpl.o: vpl.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+vpl.o: vpl.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
--waypt.o: waypt.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+waypt.o: waypt.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h grtcirc.h \
-   src/core/logging.h
--wbt-200.o: wbt-200.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+wbt-200.o: wbt-200.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   gbser.h grtcirc.h
--wfff_xml.o: wfff_xml.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+wfff_xml.o: wfff_xml.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h xmlgeneric.h
--wintec_tes.o: wintec_tes.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+wintec_tes.o: wintec_tes.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h
--xcsv.o: xcsv.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+xcsv.o: xcsv.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   csv_util.h garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-@@ -1098,46 +1092,18 @@ xcsv.o: xcsv.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h grtcirc.h \
-   src/core/logging.h src/core/textstream.h src/core/file.h strptime.h \
-   xcsv.h format.h xcsv_tokens.gperf
--xmlgeneric.o: xmlgeneric.cc defs.h config.h zlib/zlib.h zlib/zconf.h \
-+xmlgeneric.o: xmlgeneric.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h xmlgeneric.h src/core/file.h
--xmltag.o: xmltag.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+xmltag.o: xmltag.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   src/core/xmltag.h
--xol.o: xol.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+xol.o: xol.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   garmin_tables.h jeeps/gpsmath.h jeeps/gpsport.h src/core/file.h \
-   src/core/xmlstreamwriter.h xmlgeneric.h
--yahoo.o: yahoo.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \
-+yahoo.o: yahoo.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-   yahoo.h format.h xmlgeneric.h
--zlib/adler32.o: zlib/adler32.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \
--  config.h
--zlib/compress.o: zlib/compress.c zlib/zlib.h zlib/zconf.h config.h
--zlib/crc32.o: zlib/crc32.c zlib/zutil.h zlib/zlib.h zlib/zconf.h config.h \
--  zlib/crc32.h
--zlib/deflate.o: zlib/deflate.c zlib/deflate.h zlib/zutil.h zlib/zlib.h \
--  zlib/zconf.h config.h
--zlib/gzclose.o: zlib/gzclose.c zlib/gzguts.h zlib/zlib.h zlib/zconf.h \
--  config.h
--zlib/gzlib.o: zlib/gzlib.c zlib/gzguts.h zlib/zlib.h zlib/zconf.h \
--  config.h
--zlib/gzread.o: zlib/gzread.c zlib/gzguts.h zlib/zlib.h zlib/zconf.h \
--  config.h
--zlib/gzwrite.o: zlib/gzwrite.c zlib/gzguts.h zlib/zlib.h zlib/zconf.h \
--  config.h
--zlib/infback.o: zlib/infback.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \
--  config.h zlib/inftrees.h zlib/inflate.h zlib/inffast.h zlib/inffixed.h
--zlib/inffast.o: zlib/inffast.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \
--  config.h zlib/inftrees.h zlib/inflate.h zlib/inffast.h
--zlib/inflate.o: zlib/inflate.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \
--  config.h zlib/inftrees.h zlib/inflate.h zlib/inffast.h zlib/inffixed.h
--zlib/inftrees.o: zlib/inftrees.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \
--  config.h zlib/inftrees.h
--zlib/trees.o: zlib/trees.c zlib/deflate.h zlib/zutil.h zlib/zlib.h \
--  zlib/zconf.h config.h zlib/trees.h
--zlib/uncompr.o: zlib/uncompr.c zlib/zlib.h zlib/zconf.h config.h
--zlib/zutil.o: zlib/zutil.c zlib/zutil.h zlib/zlib.h zlib/zconf.h config.h \
--  zlib/gzguts.h
- internal_styles.cc: mkstyle.sh $(srcdir)/style/*.style
-       $(srcdir)/mkstyle.sh > internal_styles.cc || (rm -f internal_styles.cc ; exit 1)

diff --git a/debian/patches/0007-Use-system-shapelib.patch b/debian/patches/0007-Use-system-shapelib.patch
deleted file mode 100644 (file)
index 43a601b..0000000
--- a/debian/patches/0007-Use-system-shapelib.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Thu, 30 May 2019 12:10:23 +0200
-Subject: Use system shapelib
-
----
- Makefile.in  | 17 ++++++-----------
- configure.ac |  3 +++
- shape.cc     |  2 +-
- shape.h      |  2 +-
- 4 files changed, 11 insertions(+), 13 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index be6f7d0..d277644 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -104,8 +104,6 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
- # Extra modules in Jeeps that we don't use
- #     jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o
- 
--SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o
--
- LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
-           csv_util.o strptime.o grtcirc.o util_crc.o xmlgeneric.o \
-           formspec.o xmltag.o cet.o cet_util.o fatal.o rgbcolors.o \
-@@ -507,7 +505,7 @@ filter_vecs.o: filter_vecs.cc defs.h config.h \
-   ggv_bin.h globalsat_sport.h gpx.h src/core/xmlstreamwriter.h \
-   src/core/xmltag.h kml.h xmlgeneric.h legacyformat.h lowranceusr.h \
-   mynav.h nmea.h osm.h qstarz_bl_1000.h random.h shape.h \
--  shapelib/shapefil.h subrip.h unicsv.h src/core/textstream.h xcsv.h \
-+  subrip.h unicsv.h src/core/textstream.h xcsv.h \
-   garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \
-   jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-@@ -532,7 +530,7 @@ garmin.o: garmin.cc defs.h config.h formspec.h \
-   dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \
-   globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \
-   kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \
--  qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \
-+  qstarz_bl_1000.h random.h shape.h subrip.h \
-   unicsv.h src/core/textstream.h xcsv.h yahoo.h
- garmin_device_xml.o: garmin_device_xml.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h \
-@@ -819,7 +817,7 @@ magproto.o: magproto.cc defs.h config.h \
-   dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \
-   globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \
-   kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \
--  qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \
-+  qstarz_bl_1000.h random.h shape.h subrip.h \
-   unicsv.h src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h \
-   jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \
-   jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
-@@ -835,7 +833,7 @@ main.o: main.cc defs.h config.h formspec.h \
-   garmin_fit.h geojson.h ggv_bin.h globalsat_sport.h gpx.h \
-   src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \
-   legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \
--  random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \
-+  random.h shape.h subrip.h unicsv.h \
-   src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
-   jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
-   jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
-@@ -955,10 +953,7 @@ session.o: session.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
- shape.o: shape.cc defs.h config.h formspec.h \
-   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
--  shape.h format.h shapelib/shapefil.h
--shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h
--shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h
--shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h
-+  shape.h format.h
- skyforce.o: skyforce.cc defs.h config.h \
-   formspec.h inifile.h gbfile.h session.h src/core/datetime.h \
-   src/core/optional.h
-@@ -1053,7 +1048,7 @@ vecs.o: vecs.cc defs.h config.h formspec.h \
-   src/core/file.h ggv_bin.h globalsat_sport.h gpx.h \
-   src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \
-   legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \
--  random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \
-+  random.h shape.h subrip.h unicsv.h \
-   src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \
-   jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \
-   jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \
-diff --git a/configure.ac b/configure.ac
-index cdfe3f9..96316d4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -67,6 +67,9 @@ AC_ARG_ENABLE([shapefile],
-       [AS_VAR_SET([enable_shapefile], [yes])])
- AS_IF([test "$enable_shapefile" = "yes"], [
-       AC_DEFINE(SHAPELIB_ENABLED, 1, [1 to enable shapefile support])
-+      PKG_CHECK_MODULES(SHAPELIB, shapelib)
-+      CPPFLAGS="$CPPFLAGS $SHAPELIB_CFLAGS"
-+      LIBS="$LIBS $SHAPELIB_LIBS"
- ])
- AC_MSG_RESULT([$enable_shapefile])
- 
-diff --git a/shape.cc b/shape.cc
-index 933eb95..6295599 100644
---- a/shape.cc
-+++ b/shape.cc
-@@ -32,7 +32,7 @@
- 
- #include "defs.h"
- #include "shape.h"
--#include "shapelib/shapefil.h"
-+#include <shapefil.h>
- 
- 
- #if SHAPELIB_ENABLED
-diff --git a/shape.h b/shape.h
-index 0ce05af..aa3a0bf 100644
---- a/shape.h
-+++ b/shape.h
-@@ -27,7 +27,7 @@
- 
- #include "defs.h"               // for arglist_t, ARGTYPE_STRING, Waypoint, route_head, CET_CHARSET_ASCII, FF_CAP_RW_ALL, ff_cap, ff_type, ff_type_file
- #include "format.h"             // for Format
--#include "shapelib/shapefil.h"  // for DBFHandle, SHPAPI_CALL, SHPHandle
-+#include <shapefil.h>           // for DBFHandle, SHPAPI_CALL, SHPHandle
- 
- 
- #if SHAPELIB_ENABLED

diff --git a/debian/patches/0009-Drop-mac-libusb-libusb.h-dependency.patch b/debian/patches/0009-Drop-mac-libusb-libusb.h-dependency.patch
deleted file mode 100644 (file)
index 196aa3f..0000000
--- a/debian/patches/0009-Drop-mac-libusb-libusb.h-dependency.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Thu, 9 Jul 2020 21:59:38 +0200
-Subject: Drop mac/libusb/libusb.h dependency
-
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index d277644..b43e3d4 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -714,7 +714,7 @@ jeeps/gpsdevice_usb.o: jeeps/gpsdevice_usb.cc jeeps/gps.h jeeps/../defs.h \
-   jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \
-   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/garminusb.h \
-   jeeps/gpsusbcommon.h jeeps/gpsusbint.h
--jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h mac/libusb/libusb.h \
-+jeeps/gpslibusb.o: jeeps/gpslibusb.cc config.h \
-   jeeps/../defs.h formspec.h inifile.h gbfile.h \
-   defs.h session.h src/core/datetime.h src/core/optional.h \
-   jeeps/garminusb.h jeeps/gpsdevice.h jeeps/gps.h jeeps/gpsport.h \

diff --git a/debian/patches/618.patch b/debian/patches/618.patch
deleted file mode 100644 (file)
index c90400b..0000000
--- a/debian/patches/618.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From ba6a359d7be51ee1d0a553cc584103395675ea8e Mon Sep 17 00:00:00 2001
-From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
-Date: Thu, 6 Aug 2020 08:23:11 -0600
-Subject: [PATCH] fix endianness/packing issues with energympro,
- globalsat_sport.
-
-this was motivated by test failures seen at
-https://buildd.debian.org/status/fetch.php?pkg=gpsbabel&arch=s390x&ver=1.7.0%2Bds-3&stamp=1594393020&raw=0
----
- energympro.cc      | 58 ++++++++++++++++++++++++++++++++++++++++------
- energympro.h       |  2 +-
- globalsat_sport.cc |  6 ++---
- 3 files changed, 55 insertions(+), 11 deletions(-)
-
-diff --git a/energympro.cc b/energympro.cc
-index 2695a8f52..978052a18 100644
---- a/energympro.cc
-+++ b/energympro.cc
-@@ -33,7 +33,7 @@
- 
- #include "defs.h"
- #include "energympro.h"
--#include "gbfile.h"             // for gbfgetc, gbfseek, gbfclose, gbfopen, gbfread, gbfgetuint32, gbfcopyfrom, gbfgetuint16, gbfile, gbsize_t
-+#include "gbfile.h"             // for gbfgetc, gbfgetuint16, gbfgetuint32, gbfseek, gbfgetint16, gbfclose, gbfopen, gbfcopyfrom, gbfile, gbsize_t
- #include "src/core/datetime.h"  // for DateTime
- 
- 
-@@ -46,22 +46,48 @@ void
- EnergymproFormat::read_point(route_head* gpsbabel_route, gpsbabel::DateTime& gpsDateTime) const
- {
-   tw_point point{};
--  gbfread(&point, sizeof(tw_point), 1, file_in);
-+  point.Latitude = gbfgetuint32(file_in);
-+  point.Longitude = gbfgetuint32(file_in);
-+  point.Altitude = gbfgetint16(file_in);
-+  point.reserved1 = gbfgetuint16(file_in);
-+  point.Speed = gbfgetuint32(file_in);
-+  point.IntervalDist = gbfgetuint16(file_in);
-+  point.reserved2 = gbfgetuint16(file_in);
-+  point.IntervalTime = gbfgetuint32(file_in);
-+  point.Status = gbfgetc(file_in);
-+  point.HR_Heartrate = gbfgetc(file_in);
-+  point.HR_Status = gbfgetc(file_in);
-+  point.reserved3 = gbfgetc(file_in);
-+  point.Speed_Speed = gbfgetuint32(file_in);
-+  point.Speed_Status = gbfgetc(file_in);
-+  point.reserved4 = gbfgetc(file_in);
-+  point.reserved5 = gbfgetc(file_in);
-+  point.reserved6 = gbfgetc(file_in);
-+  point.Cadence_Cadence = gbfgetc(file_in);
-+  point.Cadence_Status = gbfgetc(file_in);
-+  point.Power_Cadence = gbfgetuint16(file_in);
-+  point.Power_Power = gbfgetuint16(file_in);
-+  point.Power_Status = gbfgetc(file_in);
-+  point.reserved7 = gbfgetc(file_in);
-+  point.Temp = gbfgetc(file_in);
-+  point.reserved8 = gbfgetc(file_in);
-+  point.reserved9 = gbfgetc(file_in);
-+  point.reserved10 = gbfgetc(file_in);
-   if (global_opts.debug_level > 1) {
-     printf("Point: lat:%8u long:%8u alt:%8d ", point.Latitude, point.Longitude, point.Altitude);
--    printf("speed:%6u dist:%5u time:%5u Status:%1u", point.Speed, point.IntervalDist, point.lntervalTime, point.Status);
-+    printf("speed:%6u dist:%5u time:%5u Status:%1u", point.Speed, point.IntervalDist, point.IntervalTime, point.Status);
-     printf("HR:(%3d,%1d)", point.HR_Heartrate, point.HR_Status);
-     printf("Speed:(%8u,%1d)", point.Speed_Speed, point.Speed_Status);
-     printf("Cad:(%3d,%1d)", point.Cadence_Cadence, point.Cadence_Status);
-     printf("Power (Cad:%6d Pow:%6d,%2d)Temp:%3d\n", point.Power_Cadence, point.Power_Power, point.Power_Status, point.Temp);
- 
-     qDebug() << "DateTime1:" << gpsDateTime.toString();
--    qDebug() << "point.lntervalTime:" << point.lntervalTime;
-+    qDebug() << "point.IntervalTime:" << point.IntervalTime;
-   }
- 
--  //Time from last point in sec's * 10 (e.g. point.lntervalTime is sec multiplied with 10)
-+  //Time from last point in sec's * 10 (e.g. point.IntervalTime is sec multiplied with 10)
-   // convert to millisecs
--  gpsDateTime = gpsDateTime.addMSecs(point.lntervalTime*100);
-+  gpsDateTime = gpsDateTime.addMSecs(point.IntervalTime*100);
- 
-   auto waypt = new Waypoint;
-   waypt->latitude = (point.Latitude / 1000000.0);
-@@ -95,7 +121,25 @@ void
- EnergymproFormat::read_lap() const
- {
-   tw_lap lap{};
--  gbfread(&lap, sizeof(tw_lap), 1, file_in);
-+  lap.splitTime = gbfgetuint32(file_in);
-+  lap.TotalTime = gbfgetuint32(file_in);
-+  lap.Number = gbfgetuint16(file_in);
-+  lap.reserved1 = gbfgetuint16(file_in);
-+  lap.lDistance = gbfgetuint32(file_in);
-+  lap.Calorie = gbfgetuint16(file_in);
-+  lap.reserved2 = gbfgetuint16(file_in);
-+  lap.MaxSpeed = gbfgetuint32(file_in);
-+  lap.AvgSpeed = gbfgetuint32(file_in);
-+  lap.MaxHeartrate = gbfgetc(file_in);
-+  lap.AvgHeartrate = gbfgetc(file_in);
-+  lap.MinAlti = gbfgetint16(file_in);
-+  lap.MaxAlti = gbfgetint16(file_in);
-+  lap.AvgCad = gbfgetc(file_in);
-+  lap.MaxCad = gbfgetc(file_in);
-+  lap.AvgPower = gbfgetuint16(file_in);
-+  lap.MaxPower = gbfgetuint16(file_in);
-+  lap.StartRecPt = gbfgetuint16(file_in);
-+  lap.FinishRecPt = gbfgetuint16(file_in);
-   if (global_opts.debug_level > 1) {
-     printf("LAP: splitTime:%6us TotalTime:%6us LapNumber:%5d ", lap.splitTime/10, lap.TotalTime/10, lap.Number);
-     printf("dist:%08um Cal:%5u Speed:(%6u,%6u) ", lap.lDistance, lap.Calorie, lap.MaxSpeed, lap.AvgSpeed);
-diff --git a/energympro.h b/energympro.h
-index 18403fb1d..d5e9a5996 100644
---- a/energympro.h
-+++ b/energympro.h
-@@ -119,7 +119,7 @@ class EnergymproFormat : public Format
-     uint32_t  Speed;
-     uint16_t  IntervalDist;          // Interval Distance
-     uint16_t  reserved2;
--    uint32_t  lntervalTime;          // Interval time
-+    uint32_t  IntervalTime;          // Interval time
-     uint8_t   Status;                //Status (0 = ok, 1 = miss, 2 = no good, 3 = bad)
-     uint8_t   HR_Heartrate;
-     uint8_t   HR_Status;
-diff --git a/globalsat_sport.cc b/globalsat_sport.cc
-index 269c55e27..af755f97b 100644
---- a/globalsat_sport.cc
-+++ b/globalsat_sport.cc
-@@ -120,12 +120,12 @@ GlobalsatSportFormat::recv_byte()
-   if (!opt_input_dump_file) {
-     result=serial_recv_byte();
-   } else {
--    int bytes = gbfread(&result, 1, 1, in_file);
--    is_fatal((bytes != 1), MYNAME ": read error");
-+    result = gbfgetc(in_file);
-+    is_fatal((result < 0), MYNAME ": read error");
-   }
-   // Check if byte should be dumped also into a file
-   if (dumpfile) {
--    gbfwrite(&result, 1, 1, dumpfile);
-+    gbfputc(result, dumpfile);
-   }
-   return result;
- }

diff --git a/debian/patches/620.patch b/debian/patches/620.patch
deleted file mode 100644 (file)
index 6af208c..0000000
--- a/debian/patches/620.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From fc5377212cfb4fe548bc918cfa2896256917125e Mon Sep 17 00:00:00 2001
-From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
-Date: Fri, 7 Aug 2020 06:58:05 -0600
-Subject: [PATCH] fix i386 regression error with engima.
-
-this was motivated by the test failure seen at
-https://buildd.debian.org/status/fetch.php?pkg=gpsbabel&arch=i386&ver=1.7.0%2Bds-4&stamp=1596794554&raw=0
----
- enigma.cc | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/enigma.cc b/enigma.cc
-index 850f27b4e..32fea92d6 100644
---- a/enigma.cc
-+++ b/enigma.cc
-@@ -21,9 +21,16 @@
- 
-  */
- 
-+#include <cmath>           // for fabs, lround
-+#include <cstdint>         // for int32_t, uint8_t, uint32_t
-+#include <cstdlib>         // for abs
-+#include <cstring>         // for strlen, memcpy, memset
-+
-+#include <QtCore/QString>  // for QString
-+
- #include "defs.h"
--#include <cmath>
--#include <cstdlib>
-+#include "gbfile.h"        // for gbfclose, gbfopen_le, gbfread, gbfwrite, gbfile
-+
- 
- #define MYNAME "Enigma binary route and waypoint file format"
- 
-@@ -177,7 +184,7 @@ enigma_waypt_disp(const Waypoint* wpt)
-   le_write32(&ewpt.longitude, decToEnigmaPosition(wpt->longitude));
-   ewpt.waypoint_type = WTYPE_WAYPOINT;
-   if (wpt->altitude != unknown_alt) {
--    le_write32(&ewpt.data.wp_altitude, METERS_TO_FEET(wpt->altitude) + 1000);
-+    le_write32(&ewpt.data.wp_altitude, lround(METERS_TO_FEET(wpt->altitude)) + 1000);
-   }
-   if (wpt->shortname != nullptr) {
-     ewpt.shortname_len = (uint8_t) min(6, strlen(CSTRc(wpt->shortname)));

diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
deleted file mode 100644 (file)
index 010e5a2..0000000
--- a/debian/patches/cross.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gpsbabel-1.6.0+ds.orig/configure.ac
-+++ gpsbabel-1.6.0+ds/configure.ac
-@@ -304,7 +304,8 @@
-                       [AC_MSG_RESULT(rpath required)],
-                       [AC_MSG_FAILURE(loader cannot find Qt library)
-                       LDFLAGS="$OLDFLAGS"]
--                      )]
-+                      )],
-+              [AC_MSG_RESULT(cross. assuming rpath not needed)]
-               )
-       CPPFLAGS="$OCPPFLAGS"
-       LIBS="$OLIBS"

diff --git a/debian/patches/gmapbase.html-location b/debian/patches/gmapbase.html-location
index bbfe44cdd18f4b9de8d67484f14778398487b753..b95918ade0ad8dab342e4aad580b3230498f3932 100644 (file)
--- a/debian/patches/gmapbase.html-location
+++ b/debian/patches/gmapbase.html-location
@@ -1,11 +1,11 @@
 --- a/gui/map.cc
 +++ b/gui/map.cc
-@@ -90,7 +90,7 @@ Map::Map(QWidget* parent,
-   connect(mclicker, SIGNAL(logTime(QString)), this, SLOT(logTime(QString)));
- #endif
- 
+@@ -91,7 +91,7 @@ Map::Map(QWidget* parent,
+   // 1. In the file system in the same directory as the executable.
+   // 2. In the Qt resource system.  This is useful if the resource was compiled
+   //    into the executable.
 -  QString baseFile =  QApplication::applicationDirPath() + "/gmapbase.html";
 +  QString baseFile =  "/usr/share/gpsbabel/gmapbase.html";
-   if (!QFile(baseFile).exists()) {
-     QMessageBox::critical(nullptr, appName,
-                           tr("Missing \"gmapbase.html\" file.  Check installation"));
+   QString fileName;
+   QUrl baseUrl;
+   if (QFile(baseFile).exists()) {

diff --git a/debian/patches/gpsbabelfe_disable_version_check b/debian/patches/gpsbabelfe_disable_version_check
index 60bd3a2994e48a3d03388e674712c787153f8256..77f2c7b13d9d27c05035f3d560e4c66ed7e72665 100644 (file)
--- a/debian/patches/gpsbabelfe_disable_version_check
+++ b/debian/patches/gpsbabelfe_disable_version_check
@@ -18,15 +18,15 @@ Disable version mismatch check.
       </widget>
 --- a/gui/preferences.cc
 +++ b/gui/preferences.cc
-@@ -43,7 +43,6 @@ Preferences::Preferences(QWidget* parent, QList<Format>& formatList,
+@@ -42,7 +42,6 @@ Preferences::Preferences(QWidget* parent, QList<Format>& formatList,
  
    ui_.startupCheck->setChecked(babelData_.startupVersionCheck_);
    ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_);
 -  ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_);
-   // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
-   if (VERSION == QString("1.4.1")) {
-     babelData_.ignoreVersionMismatch_ = false;
-@@ -87,7 +86,6 @@ void Preferences::acceptClicked()
+ 
+   connect(ui_.buttonBox, &QDialogButtonBox::accepted, this, &Preferences::acceptClicked);
+   connect(ui_.buttonBox, &QDialogButtonBox::rejected, this, &Preferences::rejectClicked);
+@@ -82,7 +81,6 @@ void Preferences::acceptClicked()
  
    babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked();
    babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked();
@@ -36,7 +36,7 @@ Disable version mismatch check.
  
 --- a/gui/babeldata.h
 +++ b/gui/babeldata.h
-@@ -67,7 +67,7 @@ public:
+@@ -66,7 +66,7 @@ public:
      startupVersionCheck_(true),
      reportStatistics_(true),
      allowBetaUpgrades_(false),

diff --git a/debian/patches/gpsbabelfe_do-not-check-for-newer-version b/debian/patches/gpsbabelfe_do-not-check-for-newer-version
index 80471a965d22b744636aa9884190b94a7862fc22..2d4ec51d8bcced948df5881ad9261731e458d77f 100644 (file)
--- a/debian/patches/gpsbabelfe_do-not-check-for-newer-version
+++ b/debian/patches/gpsbabelfe_do-not-check-for-newer-version
@@ -2,31 +2,31 @@ Disable check for newer versions on start.
 
 --- a/gui/preferences.ui
 +++ b/gui/preferences.ui
-@@ -40,13 +40,6 @@
+@@ -39,13 +39,6 @@
+         </rect>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_4">
-         <item>
+-        <item>
 -         <widget class="QCheckBox" name="startupCheck">
 -          <property name="text">
 -           <string>Check for newer version on start.</string>
 -          </property>
 -         </widget>
 -        </item>
--        <item>
+         <item>
           <widget class="QCheckBox" name="reportStatisticsCheck">
            <property name="text">
-            <string>Anonymously report usage data.</string>
 --- a/gui/preferences.cc
 +++ b/gui/preferences.cc
-@@ -41,7 +41,6 @@ Preferences::Preferences(QWidget* parent, QList<Format>& formatList,
+@@ -40,7 +40,6 @@ Preferences::Preferences(QWidget* parent, QList<Format>& formatList,
  {
    ui_.setupUi(this);
  
 -  ui_.startupCheck->setChecked(babelData_.startupVersionCheck_);
    ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_);
-   // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
-   if (VERSION == QString("1.4.1")) {
-@@ -84,7 +83,6 @@ void Preferences::acceptClicked()
+ 
+   connect(ui_.buttonBox, &QDialogButtonBox::accepted, this, &Preferences::acceptClicked);
+@@ -79,7 +78,6 @@ void Preferences::acceptClicked()
      formatList_[i].setHidden(item->checkState() == Qt::Unchecked);
    }
  
@@ -36,7 +36,7 @@ Disable check for newer versions on start.
  }
 --- a/gui/babeldata.h
 +++ b/gui/babeldata.h
-@@ -64,7 +64,7 @@ public:
+@@ -63,7 +63,7 @@ public:
      upgradeErrors_(0),
      upgradeOffers_(0),
      runCount_(0),
@@ -69,20 +69,18 @@ Disable check for newer versions on start.
      <string>Visit Website...</string>
 --- a/gui/mainwindow.cc
 +++ b/gui/mainwindow.cc
-@@ -174,7 +174,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
-   connect(ui_.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX()));
-   connect(ui_.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX()));
-   connect(ui_.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX()));
--  connect(ui_.actionUpgradeCheck, SIGNAL(triggered()), this, SLOT(upgradeCheckActionX()));
-   connect(ui_.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX()));
- 
-   connect(ui_.inputFormatCombo,  SIGNAL(currentIndexChanged(int)),
-@@ -231,19 +230,7 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
+@@ -176,7 +176,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
+   connect(ui_.actionAbout, &QAction::triggered, this, &MainWindow::aboutActionX);
+   connect(ui_.actionVisit_Website, &QAction::triggered, this, &MainWindow::visitWebsiteActionX);
+   connect(ui_.actionMake_a_Donation, &QAction::triggered, this, &MainWindow::donateActionX);
+-  connect(ui_.actionUpgradeCheck, &QAction::triggered, this, &MainWindow::upgradeCheckActionX);
+   connect(ui_.actionPreferences, &QAction::triggered, this, &MainWindow::preferencesActionX);
  
-   //--- Restore from registry
+ // TODO: Qt6 deleted the obsolete overloaded signal QComboBox::currentIndexChanged(const QString &text)
+@@ -233,17 +232,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
    restoreSettings();
--
-   upgrade = new UpgradeCheck(parent, formatList_, babelData_);
+ 
+   upgrade = new UpgradeCheck(this, formatList_, babelData_);
 -  if (babelData_.startupVersionCheck_) {
 -    upgrade->checkForUpgrade(babelVersion_, babelData_.upgradeCheckTime_,
 -                             allowBetaUpgrades());
@@ -97,7 +95,7 @@ Disable check for newer versions on start.
  }
  
  //------------------------------------------------------------------------
-@@ -1068,10 +1055,6 @@ void MainWindow::applyActionX()
+@@ -1007,10 +995,6 @@ void MainWindow::applyActionX()
  //------------------------------------------------------------------------
  void MainWindow::closeActionX()
  {

diff --git a/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting b/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting
index 6cd4c2007b6df562dcc71cee437a05f589e0eb72..d161aaed966101671a1b93e7b6bfa3a36fe1df35 100644 (file)
--- a/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting
+++ b/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting
@@ -1,7 +1,7 @@
 Make statistics reporting an opt-in option.
 --- a/gui/babeldata.h
 +++ b/gui/babeldata.h
-@@ -65,7 +65,7 @@ public:
+@@ -64,7 +64,7 @@ public:
      upgradeOffers_(0),
      runCount_(0),
      startupVersionCheck_(true),

diff --git a/debian/patches/htmldoc-location b/debian/patches/htmldoc-location
index ea07cbd03dbff5e360be83e25e7e34d4c7129b63..2ff47e9c7ab1fb1e3a9ad5c1e8a2ced7f911e273 100644 (file)
--- a/debian/patches/htmldoc-location
+++ b/debian/patches/htmldoc-location
@@ -1,9 +1,9 @@
 --- a/gbversion.h.in
 +++ b/gbversion.h.in
-@@ -13,5 +13,5 @@
- #define VER_PRODUCT_STR  "@GBMAJOR@.@GBMINOR@.@GBMICRO@@PACKAGE_RELEASE@"
+@@ -14,5 +14,5 @@
  #else
- #define VERSION "@GBMAJOR@.@GBMINOR@.@GBMICRO@@PACKAGE_RELEASE@"
+ #define VERSION "@GB.MAJOR@.@GB.MINOR@.@GB.MICRO@@GB.PACKAGE_RELEASE@"
+ constexpr char kVersionSHA[] = "@GB.SHA@";
 -#define WEB_DOC_DIR "https://www.gpsbabel.org/htmldoc-@DOCVERSION@"
 +#define WEB_DOC_DIR "file:///usr/share/doc/gpsbabel/gpsbabel.html"
  #endif
@@ -29,7 +29,7 @@
  compare_nole ${REFERENCE}/filter0.txt ${TMPDIR}/filter0.txt
 --- a/xmldoc/gpsbabel_man.xml
 +++ b/xmldoc/gpsbabel_man.xml
-@@ -118,7 +118,7 @@ or as the backend for other tools. </para>
+@@ -127,7 +127,7 @@ or as the backend for other tools. </para>
          </listitem>
        </varlistentry>
      </variablelist>

diff --git a/debian/patches/series b/debian/patches/series
index 2af2336c16fc0c59808ebe4dfab669a22c837556..f06b43b1199de9027887f8a1e8453670f0ed3ca4 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,10 +2,4 @@ gpsbabelfe_disable_version_check
 gpsbabelfe_opt-in-for-usage-data-reporting
 gpsbabelfe_do-not-check-for-newer-version
 htmldoc-location
-0006-Use-system-zlib.patch
-0007-Use-system-shapelib.patch
-cross.patch
 gmapbase.html-location
-0009-Drop-mac-libusb-libusb.h-dependency.patch
-618.patch
-620.patch